A little clean up and organization.