Minor code change for style (return A instead of if(A) return true; return false)