cleaned up code running clean