adding refactoring todos