A little cleanup and organization