Addresses PR review comments, def close does nothing now