Fix type names and indenting

Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>