simplifying and cleaning up some style aspects