Removed separate method for initialization