Refactoring database columns