Tidied up some db models