Code Cleanup

Just some code clean-up. Java-doc tomorrow.