Reduce Technical Debt by reducing cyclomatic complexity. Also fix import
of Non interupting boundary timer event
reduce cyclomatic complexity, reduce method length