Updated spacing. Moved todo init to controller