Style changes
Refactors and cleanup