House keeping

Cleaning up things

Signed-off-by: Wayne Hanley <wayney@gmail.com>