Fix: Typos and Cleanup