Some CodingConventions and small fixes