Update todo with refactoring ideas