fix naming issue
fix code for nil argument, fix naming issue