Naming tidy up, move ad logic out of app