formatting changes, because i'm anal