Some minor cleaning up for release v1.0

Signed-off-by: Mark Kamsma <mark@markkamsma.nl>