Made more Changes

Just cleaned it up so it was easier to read when outputted to the user.