Label tweaks

Doesn't change functionality, just refactors into separate methods.