better organization for classes