Some corrections to comply with PEP 8
more work on forms