Tidied

also use parens around subroutine calls, otherwise OTRSCodepoly fails