minor improvement & cleanup