Fix handling Recieving calls

PS2-5 : Tabs + Cleanup

Change-Id: Ic49e853442b71b8a7d4cad3e82c22dbe3000698c