finalized most recent style changes