styles, code cleaning