Cleaned up Script