[Silly] Code cleanup