Issue #448 Fixed code conventions