A6: Updated my solution

So much redundant code....but it's now removed!