minor refactoring

Signed-off-by: Julian Howes <jhowes@compaq8300.(none)>