Removed fluffy language (needs more more of this), tighted things up slightly