small changes for less magic values