golint and minor simplification

Nice package. Just saw this and had a tic :)