improve lisibility -- fixes