Cosmetic changes
Use boolean comparison instead of string comparison in the template