de-clutter code