Stylistic updates and code cleanup