Refactored some method names and working on documentation.