* fix line-breaks
* code cleanup