- minor refactoring to comply with python standards