style changes / clean up