Golang Improvements