Code cleanup, a small bugfix, and formatting issues fixed.

* Ideas, how would we make this application more internationalizable?