Cleanup some inconsistencies

Still a few more that will hopefully be squashed once a standardized format is agreed upon.