maintainance
Tweaking and commenting