Fixed the last comments