Refactored and cleaned...