code style cleanup in models