Using present? instead of ! empty?, moved notification ogic to models concern, fixed some typos