Cleaning up app constructor