cleaner classes. gettign ready for entity framework