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

* Ideas, how would we make this application more internationalizable?

Notice the large number of formatting changes that were made (mostly automatically by Android Studio). Code formatting is really important so that teams can work together. What do you think?
This is actually a bug fix. You really can't, in Java, compare strings with == or !=. It's really accidental that it worked. You need to use the .equals() method to get the correct results.