solved small bug
refactored.