Some more code cleaning
Merge branch 'master' of https://github.com/ekowabaka/wyf