DRY

Your code is horrible and I fixed it