Code clean: define constants for field names