Refactoring and adding of column names