#179 

I think we can achieve the same goal with less lines of code