Stylistic updates and cleaned up comments