Cleaner way to add classes