Code Review

Just a convention and a small thing about declaring variables in the return type!

<3 Go