Comments updates and cleanup