Minor coding and organizing.