Refactor Code

Refactor my code, to make it more efficient