Refactored code, every little helps