Removed unecessary for statement
Refactored somewhat