style edit and removed unused classes