Cleaned up the code (2)