Made code -Wextra clean