Clean up whitespace.
Remove _Hz suffix.
Don't specify subobject in intializer (compiler warning).