Done

All tasks and refactored code