Refactor; remove Comment model