Follow code conventions