Remove redundant test
Remove unnecessary qualifiers and modifiers