Cleaned up and corrected no project code