cleaned up stuff!