some minor change to clean up the code