Code formatting (fixing pullreview issues)