refactor
Don't require rails 4 at this time