Some minimal code cleanup