cleaning up styles - getting closer