remove boilerplate code, add comments and examples v1.4.0