refactored current methods for readability