Some slight modifications for style