Add os_codename to response and minor performance improvement
Identation fix