No short term or long term intention to merge.  Going with style that opens up the code for easier review / modification, i.e. switching from original coder focus to maintenance coder focus.