Cleaning up a bit.
Yay! No preprocessor in Java.