-Wall -Wextra clean up