#1 issue fixed and clean some code…