Switched underlines in various places to more efficient style