Refactoring changes
Internal lookup functionality
Code review
Merge pull request #2 from adlpz/master

Some changes for the greater good