Added delete issue, fixed some check style issues