Code cleanup
Intervals now seems to work as expected