Anorm refactoring

Various refactoring about Anorm.