Bit of cleanup and organization