Reformatting reroute object, and adjusting small stylistic stuff in less