Need to refine some of the coding standards here.   Specifically whitespace and yoda conditions.