A lot of small but good changes

Using the advice of /r/golang!