Changed: cleaned code