Code tweaks and go fmt