Code formatting, added constant, passed missing params following review