Clean-up of markup. Single if-statement. Smarter?