Code Refactored

Signed-off-by: BigDataPlayers <bigdataplayers@gmail.com>