A bit of cleanup, use consistent naming conventions.