Clean Up and Complete My Project