Code Cleaup