refining some stuff