just some minor refactoring

Signed-off-by: Tass Skoudros <tass@skystack.com>