Minor Refactoring and ToDo