Replaced unnecessary factory with named contructor!