Corrects some checkstyle, pmd issues with lack of braces on if statements and
unnecessary use of toString() on Strings