Move more method calls out of the constructor