Code Cleanup, and slight bug

- Change from seconds delay to milliseconds