Clean Up Coding Errors