Final major style and file changes