* Fix, improve, cleanup and moved util methods to separated classes
* Removed all static imports