styling, code cleaning