Moved .init()'s to the init method