code gardening and update readme

Signed-off-by: Andre Dublin <81dublin@gmail.com>