HBSD: refactor

Signed-off-by: Oliver Pinter <oliver.pntr@gmail.com>