Updated: Some standards

I'm not looking forward to doing this.