Removed trailing whitespace.
Added some style.
Tracking down user lookup bug.