Issue #63: Removed some duplicated constants