Cleanup. Change impl. details.