Minor changes, line ordering and whitespace