Fix method definition
Refactor initialization to add more initialization steps
Move X initialization to initialize method