Make project be complient with Minsk article
Remove redundant comments
refactor