Fixes #5 and cleans repo