deepak | refactoring around use of windows