Formatting, refactoring
Glob semicolons