minor cleanup
starting on actual plumbing