[4.2] Replace 4-spaces with tabs and minor alignment fixes