Cleaning up Checkstyle violations from b1c1636 and 39f77ad