Small code corrections for pep8 and name changes.
Working on camera in test file.