in the middle of a huge coding style change