First style adjustments to accommodate code