code convention improvements