formatting stuff fixed