Refactor

* Remove doubles dependency
* Move delays to own file