Cleans up and adds comments