Refactor to use mixin
Use sass
Fix error on item
Reset based on typeof
Trying to break problem on  when update returned_at