Refactor style

Made this conform to our updated styles according to the infographic-that-must-not-be-named.