Cleaned up some column names