Added license, Done some cleaning