Conforming to new coding style