more cleanup of naming/spacing