slight code improvements to 2012