minor cleanup of classes and styles