Final clean up and changes