Refactor + TODO cleared