re-organized some stuff