Refactor many things

* Rename
* Avoid Java collections more
* Simplify code
* And so on