ok, I'll normalize coding style in the end of the pull request when everything gets ready