slightly more readable
go fmt
laid out test suite