did some minor cleanup