License added, garbage cleaned