MP1-4069 : Cleanup Code based on Review comment.