Slight refactoring of elephant puzzle component class