Library partial refactoring

comments_count