Cleanup + Updated readme