Added some license information and did some cleanup