Part 2 of initial asteroid refactoring