changed: organization and clean up