clean up and styles added