styles & code cleaning