Tighten up klass factory function
Update readme