Cleaned up some naming and changed javadocs