[cleanup] test readability
[cleanup] restructing attributes and namings