Minor clean-up (this file will be torn up into smaller components)