Minor fixes and reformatting