Tweaked for readability