All tasks done and refactored