Task/refactor cleanup

Giving the codebase a much needed coat of polish. Refactoring to make updates easier and to make the entire site more performant.