Clean-up and re-naming