Reformat, consistify variable name, add @SuppressWarnings.