CheckStyle Cleanup