small changes to make code more consistency