proper naming and organization