First version of code (tests error)
More whitespace/line-break changes, fixed tests by using this where appropriate.
Merge pull request #33 from lararennie/label_fixes

Reverting to Java style instead of Android style.