Apply better code conventions