Some eclipse workspace settings that might help?
Also a quickie astyle run over the code..
into the common handler that delegates to the right sided handler