Refactor code

* remove unless nil? constructions
* update gemfile
* edit todo list
* update tests