Refactor current code base

[dcheli]

This is a very broad issue that will need to be broken down into more targeted tasks but there are plenty of opportunities to simply the code base (e.g. consolidate some common functions).