rearranging the code to be more readable.
Merge remote-tracking branch 'origin/master'