Updating wording, remove old TODO