small changes to conform to go style conventions