Code clean.

see commit comment.