formatting and small changes