Added input and additional formatting

Signed-off-by: jeremyesjohnson <jeremy.es.johnson@gmail.com>