Removed duplicate version declaration.
Added additional checks to Checkstyle.