cleaning-up code