RTGOV-187 Now detects end of scope for a one-way interaction. Also fixed checkstyle issue