Fix structure and remove useless line