Style cleanup, including run of make format

Also wrapped Top Tracks with tr()