Fixed the fix from 1.10.2
Reformatting / Cleanup
Bumping version