Attempted to clean up stuff!