Cleanup code conventions