Code analyzed and fixed