some change in code styling