Refactored
Little update