minor cleanup; committing because doing sth dangerous soon