Small changes

Hi Nuno,
I've made some minimal changes, some to cleanup the code (like removing dead code or moving the constants to a more understandable Enum usage), some to cleanup the project import in IDEs (tested Eclipse).
I hope each commit's comment is clear enough, but happy to discuss any detail if it's not clear.