Checkstyle and minor changes