Removed todo, corrected commenting