Cleaned up/added javadocs