Removed end handler
Replaced tabs with spaces and removed trailing ones