Verified working, cleanup