formatting and minor details