Cleanup and unify variable and field names