. Refactoring work

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@3994 b35dd754-fafc-0310-a699-88a17e54d16e