Added javadocs and moved some constants to the constants class