Several formatting changes to storage adapter