Cleaned code!