make code more consistenet