Add fields handlers + fix some PEP-8 warnings