* Refactored a tid bit