cleaned code :)