Slight Cleanup