Cleanup & function rename.