minor changes to keep up code standard