Simple Code Cleaning