cleaning code
fix bug on first load