Refactor, fix asteroid breaking