Reformatting and whitespace