simplify
improve consistency
simplify
markup formatting shouldn't impact results