some change in code readability