updated simpleDB and minor style changes