[NOJIRA]
code cleanup
[NOJIRA]
introduce Type