Pre-cleanup
Working. Cleaned up