pablo refactor

Signed-off-by: Jacek Laskowski <jacek@japila.pl>