styles
code cleaning and tests