Removed 'TODO' tag and extra new-lines