Remove unused property
Rename functions to make more sense