Fixing up standards

If anyone else wants to add, please do