Go style

Some small changes to the code for better Go style.