FIX: Fix compliance with strict
FIX: Use app.getElement and cleanup