Remove some warnings

Please reject these commits if they were specified for readability. :)