Refactor done - Assignement done - Improvements on going