Some refactoring, post CRUD working