house cleaning, refactored and removed old methods