Improve the style of the code
Improve the style of the code, remove test lines not needed
 style change