Small improvements

Use predefined constants for consistency.