More directory agnostic, some formatting changes