Some more cleanup from the previous refactor

Adds a way to get the current artist and track from the service, which should then be built upon to fix the track display. Also fixes one or two formatting inconsistencies.