General refactoring and formatting
Add missing semicolon