Simplify __construct() method more