fixing some code of boilerplate
improving documentation text