Cleaned up unneeded comment blocks, TODOs, and bad language