fixing and cleanning