Some code and comment cleaning