Refactor for kitkat

Change-Id: I7d76bf8ed5865b5053aa35abf09e95eb24d728bc
Signed-off-by: iceandfire <arhamjamal@gmail.com>