Refactored mobile first