Code Cleaned #2