Commit 7 -Code Cleanup