more snake case/cleanup