Polished application style
Fix minor style issues