Please clean this up to match the rest of the code.