- Clean-up and formatted code