Removed unused variablesscreenWidth and screenHeight
Solved minor merge conflict