Cleanup/minor refactor, removed unneeded delays