Cleanup: Use styleguide conventions on Goal fields declaration