checkstyle - tighten up as far as we can at the moment