simplify style and remove crap