Reformatting and minor style cleanup