cleanup & moved stuff around