[CT-27] Clean code
Merge pull request #18 from Power-Pill/bbo

[CT-27] Clean code