Fixes #10. Removed duplicate code, simplified handler.
Just movin' it around