Fixed indenting and moved stuff to help testing