Cleanup code + correct url (#107)