code fixes / formatting changes