add new styles and clean up code