Done. 

Have replaced the separate constructor with one default constructor that takes optional arguments. Didn't think of this, makes it a lot simpler.