Minor tweaks, got rid of tempLabel from class