Refactoring the data science solution

Do not use block comments.