Syntax cleanup while trying to remember past solutions