light text and naming function refactor