Fixed code conventions