CODE - Consistently use node attribute calls