Cleanup, small update and readme