Incorporate vi-users suggestions and clean up more