Cleaned code again