cleanup: Minor code formatting and removed obsolete constants.