cleaned code, styles added