Add missing fields to request
Fix PEP8 issues