Minor refactoring; TODO added