Refactored little more