Refactored front-end utils