cleaning up... i think.