Cleaned helpers.