Fix double spaces and other formatting issues raised by @mtbc