Checkstyle: Category Coding (some)

Change-Id: I4824d10a1a22def72e9135a441cc90299f6ca4dd