style changes and improves