Small refactoring and begin debugging presenters after DAL modification