Correct coding conventions
Correct content errors