CODE REVIEW: Code style fixes