(WIP) Better Formatting