move the delecrations of variable above if statement to be neaty
Merge remote-tracking branch 'origin/master'