Active Display: Clean-up code (cont..)