Stylistic changes and file moves