Did a small refactor of the code to clean up some duplicate code.
Merge remote-tracking branch 'origin/master'