Minor cleanup: some formatting and redundant constraint removed