Merge "Clean up formatting in class linker"