Cleaning up stuff and no underscores in variable names for go