site refactor and cleanup