Code refactoring
Signed-off-by: Izhar ul Hassan <ezhaar@gmail.com>