Refactore some code
Merge branch 'master' of https://github.com/PSD-RTS/simple-petstore-avengers