Adding check to ensure a user cannot delete themselves
Commenting and cleaning code