Cleaned up stuff