Refactor __construct for shorter method, override