Corrected Checkstyle and DRY retrieval.