Fix style and remove redundant class