Formatted most of everything, tweaked a few things