fixed and clean up practice