Replaced $(this) by $(e.currentTarget) wherever possible