style changes and dep updates
2.1.2