Remove unnecessary context changes
Formatting cleanup