fixed print syntax highlight bug, cleaner when.. then