Minor cleanup effort