[#46][#19][#6]Some more code cleanup of init.py

Some more code cleanup...