Moving things around, code clean up

much prettier now :)