first large-scale pass at e2e code cleanup