first style attempts
some minor style adjustments