cleaned comments and refactored some methods