Comply with code conventions