Coding style amendments