Refactored and cleaned up