Change init methods to use instancetype per PR request