more stylistic changes and testing