Removed some column aliases as they make it harder to check which column was ment