Silly code cleanup