Cleaned the code again