Addressing formatting and build issues.