Bp validation

Cyclomatic complexity is a way for checkstyle to say that there is something wrong here. We should avoid creating complex methods for both testing and maintaining purposes. Otherwise whats the point for checking the complexity if we suppress it anyway.