Formatted some stuff, moved some stuff around.