About to refactor __init__

Change-Id: I634fd8a2776739aab65bb3db097bfad6a2480fc6