cleaning code, get rid of warnings