improve(optimization): clean up imports & responses