Conform to the guidelines a bit more