Cleaned up some PEP-8
Removed nested fieldset