Cleaned Code and Change Columns