JANITORIAL: Code style fixes