Cleaned Code!