litt code refactoring.

Signed-off-by: Harvey Daclan <hardac@knowit.no>