Small refactor and remove unused code #19

Closed richardpon closed 9 years ago