Cleanup and adding new formatting