Nice big refactor and cleanup