updating for 3.1 compatibility

Fix style issues

Fix style issues