- reduces file lines and file size

By changing some syntax.

Test suite ok.

Hope that do not affect readability.