Made some minor changes for more cleaned up code