Improvements generator! Nice work \o/, love regex and KISS \o/