Implemented some TODOs and refactored