Code Cleaned