Fix errors found by pylint
Tidy up constants