Cleaned up the code

As per, comment with questions :smiley: