Cleanup whitespace
Standard RC updates