Output is looking better, code needs cleaning up.