Cleanup, refactor, styling, etc.