Cleanup & Updated Readme

Signed-off-by: Zeno Popovici <zeno@graffino.com>