The final cleanup

* get rid of unnecessary static methods
* rename/reorder some variables

Signed-off-by: Piotr Bocheński <bochenski.piotr@gmail.com>