Refactoring everything to make it more consistent. This is the final cleanup step before going live