refactored condition to a methed
refactored to clean up a few things