Removed more underlines