change indent to 4
cleanup indent
remove unnecessary tests; reformat
fix typo