Clean up code

There was some repetition from the former conditionals. The refactor
removes the repetition (DRY). Adding more block tags is easier now.
Add style tag to ignore list