My format & Cleanup