general clean up and update from styles