bug fix + update formatting