Update: * removed re-inventing the wheel

Signed-off-by: Gnanakeethan Balasubramaniam <gnanakeethan@gmail.com>