general: PEP8/257 improvements in models