Updated doc & README
Cleanup