Removed TODO line, as it isn't worth refactoring