Slight refactoring - Moved logic from constructor into method