:gift: Configuration and refactor

お元気ですか @jensechu?  I thought your project was really cool so I wanted to contribute back some changes, I hope you don't mind (feedback always welcomed).
No new feature is complete without test coverage :heart: