major clean up and presentation styles