Cleaning-up the code