Cleanup source code
Cleanup source code #2
Cleanup source code #3
QA: Start unit tests enhancements