formatting changes and made less verbose