More Code Cleaning