Fixed the message for delete action + indentation harmonized/fixed + code cleanup