Code cleanup to match our style