Cleaned up methods and added start of Javadocs