Readme update and minor change for code consistency