Coding style closer to project norms