Added code conventions