Updated doc and cleanup