Hopefully fixed formatting issues!