cleaned up the code a little bit and added javadocs