Decrease ClassBodyMode complexity.
Decrease MethodBodyMode complexity.
MethodBodyMode
Merge branch 'feature/fix-bugs' into develop