further surface changes to please pylint across all source files