Fixed intervals, and cleaned up