Clean up; new styles