Final touches without comments