added window prefix, improved formatting