Conforming to code conventions