Cleaning up implementation so it works out of box with git clone