Indentions & Validations

Signed-off-by: Stephen Crockett <crockett95@gmail.com>