style changes and testing