Cleanup; minor expansions due to said cleanup