Formatting changes, use new // syntax for screen path