Code cleanup
Comment cleanup
Implementation of delayed running indicator