Code Cleaning #2