cleanup + styling