Implemented all the suggestions.