remove this useless line
reorganize a bit