refactored and removed referenced code
Merge branch 'master' of github.com:ChristianChen/Swallow