Not using the db for now, and minor style changes