Cleaned up and added license