Cleanup and GPL License added