Tidy up of alias location if statement.
Cleanup of the response object methods with breaking out of certain components into their own methods.
More comments also added.