Refactored: elementa warnings