Cleanup, additional comments