refactor datamanager classes and include javadoc format