Clean-up code and remove clutter