Cleanup + new styles