cleaning up
addding Nacky's suggestions
addding Nacky's suggestions