- code refactoring and todos