Tab -> Space alignment issue
Misc whitespace and comment cleanup.
Saner method ordering in Trigger