checkstyle fixes for aspects