Improve method names.  Simplify constructor.