Code Standardization

Another test branch check-in