Finally! Minor Cleanup