Extract factory code to a new class
Rename variable in Application class