Finish star refactor. Format, clean up.