diff --git a/.gitignore b/.gitignore
index 9a500c2..264d5b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,3 +53,11 @@ coverage.xml
 docs/_build/
 
 main.db
+
+*.xml
+*.iml
+*.idea
+
+# Default ignored files
+/shelf/
+/workspace.xml
diff --git a/app.py b/app.py
index e92371a..35bc1e4 100755
--- a/app.py
+++ b/app.py
@@ -1,16 +1,15 @@
 #!/usr/bin/env python
-
 from flask import Flask
-from flask.ext.restful import Api
-
-app = Flask(__name__)
-api = Api(app)
+from flask_restful import Api
 
 from resources import TodoListResource
 from resources import TodoResource
 
-api.add_resource(TodoListResource, '/todos', endpoint='todos')
-api.add_resource(TodoResource, '/todos/<string:id>', endpoint='todo')
+app = Flask(__name__)
+api = Api(app)
+
+api.add_resource(TodoListResource, "/todos", endpoint="todos")
+api.add_resource(TodoResource, "/todos/<string:id>", endpoint="todo")
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     app.run(debug=True)
diff --git a/resources.py b/resources.py
index 5619ee1..8640b3e 100644
--- a/resources.py
+++ b/resources.py
@@ -1,21 +1,21 @@
+from flask_restful import abort
+from flask_restful import fields
+from flask_restful import marshal_with
+from flask_restful import reqparse
+from flask_restful import Resource
 
-from models import Todo
 from db import session
-
-from flask.ext.restful import reqparse
-from flask.ext.restful import abort
-from flask.ext.restful import Resource
-from flask.ext.restful import fields
-from flask.ext.restful import marshal_with
+from models import Todo
 
 todo_fields = {
-    'id': fields.Integer,
-    'task': fields.String,
-    'uri': fields.Url('todo', absolute=True),
+    "id": fields.Integer,
+    "task": fields.String,
+    "uri": fields.Url("todo", absolute=True),
 }
 
 parser = reqparse.RequestParser()
-parser.add_argument('task', type=str)
+parser.add_argument("task", type=str)
+
 
 class TodoResource(Resource):
     @marshal_with(todo_fields)
@@ -37,7 +37,7 @@ def delete(self, id):
     def put(self, id):
         parsed_args = parser.parse_args()
         todo = session.query(Todo).filter(Todo.id == id).first()
-        todo.task = parsed_args['task']
+        todo.task = parsed_args["task"]
         session.add(todo)
         session.commit()
         return todo, 201
@@ -52,7 +52,7 @@ def get(self):
     @marshal_with(todo_fields)
     def post(self):
         parsed_args = parser.parse_args()
-        todo = Todo(task=parsed_args['task'])
+        todo = Todo(task=parsed_args["task"])
         session.add(todo)
         session.commit()
         return todo, 201