Comments added, method name changed and corresponding test udpated.