Tickets 61 and 71

https://github.com/easy-wi/developer/issues/61
https://github.com/easy-wi/developer/issues/71

Some Code cleaning