Made consts more clear