Clean up entities
Updated license to BSD 3-Clause
Updated license