Removed unnecessary braces
Fixed typo in JavaDoc comment
Fixed a couple of warnings