Refactor and simplify
Merge pull request #1 from xaque208/missing

Updates