Do some cleanup and format code using rustc

Signed-off-by: Peter Atashian <retep998@gmail.com>