Commented code, also changes to coding style (2012 code -> 2014 code)