ADD: some Override annotations
CHG: I like if-else statements with braces
ADD: an Eclipse XML file wich contains the formatter rules for the code
style.
CHG: an obsolete else branch has been removed.