Clean ups, minor #161