Cleaned code to start working.