Updated to Simple.Data 0.18.3.1
General code tidying