Refactor WindowsServices methods