Major FIX! I hate CM!

PS3: Cleanup
PS4: Remove whitespace

Change-Id: I6e9576600a6f97c33472436475ec3ec797ab1745
Signed-off-by: Nick0703 <lokesh.c703@gmail.com>