Formatting
Fix warnings
Semicolons
Simplify