new styling, cleanup