Cleanup and changes