More minor clean to init.py