Reformatting and clean-ups