Removed TODO and changed toString slightly