cleaning up and added minor field