Refactoring: using prefix operator where posible