Trying to follow code conventions