No need to instantiate App twice
Scrutinizer fixes