dropping all these returns will make this class look much more like a 'document' :+1: