AAD-17: checkstyle