Small whitespace changes
Minor refactoring of response