Remove extra ,
Improve the execution flow