Fix - take bydisplay:...

See commit details.

Also, autoformats, yay!