Added JavaDoc, cleaned up the code, remove the commented out lines - Bring back corey's previous commit if something is wrong