Minor amends and splitting lines up

Once this is merged that addresses my issues.