Bringing code up to codeq standard.