some cleanups

Signed-off-by: Jens Nyberg <jens.nyberg@gmail.com>
a minor cleanup
created some enums
cli is not needed