Changed from constructor to helper method