cleaned code
minor changes