Refactored out DevTools window