major formatting revamp