Now run once
Code cleaning