Cleaned up code and got project compiling in Eclipse.