[CLEANUP] CheckStyle updates