Fix bug in user deletion
Additional markup
Fix warnings and code style