I'll clean this line, and add cleanup code