style, cleaned code