Cleaning up bad syntax and adding requirements.