Cleanup + added license