Tweaking layout a bit
Trimming whitespace
Fixing missing semicolons etc