clean up and style update