Code and Project Clean-Up