Clean-up and Fixed