Refactored a bit
Refactored a little more