Configure Application name for Google API
Code cleanup