made the code look nice and easy to read
Merge remote-tracking branch 'mike/master'