Simplified changes

Simplified the changes I made