Return proper fields in success response, code cleanup