cleanup (style + dead code removal)