Code is refactored...

Signed-off-by: rayhan <hossain.rayhan@outlook.com>