Integration to REST framework has been simplified as suggested by Tom
PEP8 fixes