better code conventions