Cleanup and add comment