Clean up of unneeded code and better return value if a value isn't avaliable at request time