Cleaned up Label Logic