Cleaning up styling and checking against new PSDs