Cleaned up, added license text