cleaned code style