Refactoring the code

Signed-off-by: JerinJ <jerinj@cybage.com>
Merge branch 'master' of https://github.com/sajus/AndeKafunda