Cleaned code
resolved