General, minor cleanup