Updated from some minor comments