Initial edit

Removed some unecessary IF's