Comment CRUD + some refactoring