Refactoring JeremyStudio