fix structure on code