Work
Work
Work
Work to make code cleaner