Code Refactoring, particularly in regards to the DAO's