Cleaned Code Up