Removed duplicates and improved naming