fixed and clean