sync up between production and in-dev released

Signed-off-by: Scanner <scanner@apricot.com>
PEP8 cleanups