Some cleanup + LICENSE content