minor cleanup
minor naming cleanup