Cosmetic fixes + change to a base file